Improve shape handling in generate_samples #3456
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… This is now handled in generate_samples.
|
I added a really small code to use |
|
I think this is ready for review again |
ColCarroll
approved these changes
May 1, 2019
pymc3/distributions/distribution.py
Outdated
| slicer_tail = [slice(None)] * len(sp_shape) | ||
| broadcasted_samples.append(param[tuple(slicer_head + slicer_tail)]) | ||
| return np.broadcast_arrays(*broadcasted_samples) | ||
| return np.asarray(samples) |
pymc3/distributions/distribution.py
Outdated
| size_tup=size_tup, | ||
| dist_shape=dist_shape, | ||
| broadcast_shape=broadcast_shape, | ||
| test=broadcast_shape[:len(size_tup)] == size_tup) |
There was a problem hiding this comment.
i like informative exceptions and am fine leaving it here, just want to flag that it is named test, so maybe you intended to remove it?
pymc3/distributions/shape_utils.py
Outdated
| @@ -0,0 +1,369 @@ | |||
| #!/usr/bin/env python3 | |||
There was a problem hiding this comment.
i think we don't typically include shebangs (#!) in files
|
Thanks @lucianopaz! Looks like no one will ever have a shape problem with PyMC3 again 😀 (this is seriously good, careful, and useful work, though!) |
|
@ColCarroll, one can always dream 🤞 |
This was referenced May 2, 2019
15 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR fixes #3421 and #3147.
Both errors happened because of how
distributions.distribution.generate_sampleshandled the supplied: parameter shapes,broadcast_shapeanddist_shape. To make this fix more robust, I wrote a small module ofshapebroadcasting utilities that are now used bygenerate_samplesand make it more robust to shape problems. I added a test suite for these functions and also forsample_prior_predictivewith certain RV shapes and sample sizes that caused #3421 and #3147.Issue #3422 remains open because that problem happens in
distributions.distribution._draw_valueand until it is fixed, some of the tests in the testsuite are expected to fail.Things I would like to ask:
generate_samplesfunction. Could you review the new version to see if you spot problems?